Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build for gazebo4 #221

Merged
merged 7 commits into from
Aug 15, 2014
Merged

Fix build for gazebo4 #221

merged 7 commits into from
Aug 15, 2014

Conversation

nkoenig
Copy link
Member

@nkoenig nkoenig commented Jul 31, 2014

No description provided.

@adolfo-rt
Copy link

Shouldn't this PR target indigo-devel?. The fix for gazebo_ros_control_plugin.cpp is already there.

It has already been suggested before, but we should change the repository's default branch to indigo-devel, especially now that indigo has been released.

@j-rivero
Copy link
Contributor

j-rivero commented Aug 1, 2014

I've tested the pull request under Trusty for:

  • gazebo4-prerelease + Indigo
  • gazebo3 + Indigo
  • gazebo2 + Indigo
  • gazebo + hydro

It is compiling just fine for me on all the combinations.

@adolfo-rt we are still producing ROS wrappers for gazebo new versions (gazebo3, gazebo4) in Hydro and it would help to have the fixes applied to both branches, hydro-devel and indigo-devel.

Thanks.

j-rivero added a commit that referenced this pull request Aug 5, 2014
@j-rivero
Port fix_build branch for indigo-devel
c2704f0 
See pull request #221
@j-rivero j-rivero mentioned this pull request Aug 5, 2014
Merged
@hsu
Copy link
Collaborator

hsu commented Aug 13, 2014

GAZEBO_VERSION_MAJOR should be GAZEBO_MAJOR_VERSION, similarly for others.

hsu
hsu reviewed Aug 13, 2014
View reviewed changes
gazebo_ros_control/src/default_robot_hw_sim.cpp
@@ -288,7 +294,11 @@ class DefaultRobotHWSim : public gazebo_ros_control::RobotHWSim
break;

case POSITION:
#if GAZEBO_VERSION_MAJOR >= 4
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be GAZEBO_MAJOR_VERSION

@adolfo-rt
Copy link

@adolfo-rt we are still producing ROS wrappers for gazebo new versions (gazebo3, gazebo4) in Hydro and it would help to have the fixes applied to both branches, hydro-devel and indigo-devel.

OK, I was not aware of this.

hsu added a commit that referenced this pull request Aug 15, 2014
@hsu
Merge pull request #221 from ros-simulation/fix_build
d478fea 
Fix build for gazebo4
@hsu hsu merged commit d478fea into hydro-devel Aug 15, 2014
cohen39 pushed a commit to cohen39/gazebo_ros_pkgs that referenced this pull request Nov 15, 2021
@j-rivero
Port fix_build branch for indigo-devel
84f2afe 
See pull request ros-simulation#221
cohen39 pushed a commit to cohen39/gazebo_ros_pkgs that referenced this pull request Nov 15, 2021
@hsu
Merge pull request ros-simulation#221 from ros-simulation/fix_build
46f1451 
Fix build for gazebo4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nkoenig @adolfo-rt @j-rivero @hsu